Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 12 Jan 2010 21:54:22 +0000 (21:54 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 12 Jan 2010 21:54:22 +0000 (21:54 +0000)
commitcfeed7fa388c4f5896af75f154bdfbf756101744
treeba95846955b8ec98a230d236fd9608fee13d8da8
parent8a6661e0b5962a92dd542491ec9ad067a6e7b801
parent0635ebd388961e50908530b4af4d63d7ce3e9ef3
Merge from mainline.